From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 3 Jul 2022 16:50:40 +0000 (-0400)
Subject: fontchooser: Make size level effective
X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~81^2^2~84^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ab1cf674321a61ddbe205e0f26631ce7980ea049;p=gtk4.git

fontchooser: Make size level effective

We were not hiding the size controls on the tweaks
page, which is arguably what should happen when
the size level is disabled.
---

diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index 0b4047471b..37967788d7 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -116,6 +116,8 @@ struct _GtkFontChooserWidget
   GtkWidget *size_label;
   GtkWidget *size_spin;
   GtkWidget *size_slider;
+  GtkWidget *size_label2;
+  GtkWidget *size_spin2;
   GtkWidget *size_slider2;
 
   GtkWidget       *axis_grid;
@@ -913,6 +915,8 @@ gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
   gtk_widget_class_bind_template_child (widget_class, GtkFontChooserWidget, size_label);
   gtk_widget_class_bind_template_child (widget_class, GtkFontChooserWidget, size_spin);
   gtk_widget_class_bind_template_child (widget_class, GtkFontChooserWidget, size_slider);
+  gtk_widget_class_bind_template_child (widget_class, GtkFontChooserWidget, size_label2);
+  gtk_widget_class_bind_template_child (widget_class, GtkFontChooserWidget, size_spin2);
   gtk_widget_class_bind_template_child (widget_class, GtkFontChooserWidget, size_slider2);
   gtk_widget_class_bind_template_child (widget_class, GtkFontChooserWidget, stack);
   gtk_widget_class_bind_template_child (widget_class, GtkFontChooserWidget, grid);
@@ -2637,12 +2641,18 @@ gtk_font_chooser_widget_set_level (GtkFontChooserWidget *fontchooser,
       gtk_widget_show (fontchooser->size_label);
       gtk_widget_show (fontchooser->size_slider);
       gtk_widget_show (fontchooser->size_spin);
+      gtk_widget_show (fontchooser->size_label2);
+      gtk_widget_show (fontchooser->size_slider2);
+      gtk_widget_show (fontchooser->size_spin2);
     }
   else
    {
       gtk_widget_hide (fontchooser->size_label);
       gtk_widget_hide (fontchooser->size_slider);
       gtk_widget_hide (fontchooser->size_spin);
+      gtk_widget_hide (fontchooser->size_label2);
+      gtk_widget_hide (fontchooser->size_slider2);
+      gtk_widget_hide (fontchooser->size_spin2);
    }
 
   update_fontlist (fontchooser);